From e14c6c1d87866e00083abde05ed13760f76307e6 Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Sun, 21 Jun 1998 22:03:58 +0000 Subject: [PATCH] Remove $(srcdir) from, and clean up, the dependencies. Generate to 1998-06-21 Raja R Harinath * gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir) from, and clean up, the dependencies. Generate to intermediate files to prevent problems with Ctrl-C. * gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir. Also commit readable/indented gtkmarshal.[ch]. --- ChangeLog | 8 ++++ ChangeLog.pre-2-0 | 8 ++++ ChangeLog.pre-2-10 | 8 ++++ ChangeLog.pre-2-2 | 8 ++++ ChangeLog.pre-2-4 | 8 ++++ ChangeLog.pre-2-6 | 8 ++++ ChangeLog.pre-2-8 | 8 ++++ gtk/Makefile.am | 63 ++++++++++++------------- gtk/genmarshal.pl | 4 +- gtk/gtkmarshal.c | 114 ++++++++++++++++++++++++++++++--------------- gtk/gtkmarshal.h | 31 ++++++++++-- 11 files changed, 191 insertions(+), 77 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0fd10e380..618d8d87ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1998-06-21 Raja R Harinath + + * gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir) + from, and clean up, the dependencies. Generate to intermediate + files to prevent problems with Ctrl-C. + + * gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir. + Fri Jun 19 14:46:56 1998 Stefan Jeske * gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d0fd10e380..618d8d87ee 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +1998-06-21 Raja R Harinath + + * gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir) + from, and clean up, the dependencies. Generate to intermediate + files to prevent problems with Ctrl-C. + + * gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir. + Fri Jun 19 14:46:56 1998 Stefan Jeske * gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d0fd10e380..618d8d87ee 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +1998-06-21 Raja R Harinath + + * gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir) + from, and clean up, the dependencies. Generate to intermediate + files to prevent problems with Ctrl-C. + + * gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir. + Fri Jun 19 14:46:56 1998 Stefan Jeske * gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d0fd10e380..618d8d87ee 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +1998-06-21 Raja R Harinath + + * gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir) + from, and clean up, the dependencies. Generate to intermediate + files to prevent problems with Ctrl-C. + + * gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir. + Fri Jun 19 14:46:56 1998 Stefan Jeske * gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d0fd10e380..618d8d87ee 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +1998-06-21 Raja R Harinath + + * gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir) + from, and clean up, the dependencies. Generate to intermediate + files to prevent problems with Ctrl-C. + + * gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir. + Fri Jun 19 14:46:56 1998 Stefan Jeske * gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d0fd10e380..618d8d87ee 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +1998-06-21 Raja R Harinath + + * gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir) + from, and clean up, the dependencies. Generate to intermediate + files to prevent problems with Ctrl-C. + + * gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir. + Fri Jun 19 14:46:56 1998 Stefan Jeske * gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d0fd10e380..618d8d87ee 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +1998-06-21 Raja R Harinath + + * gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir) + from, and clean up, the dependencies. Generate to intermediate + files to prevent problems with Ctrl-C. + + * gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir. + Fri Jun 19 14:46:56 1998 Stefan Jeske * gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c: diff --git a/gtk/Makefile.am b/gtk/Makefile.am index fa1f4caaf5..55a4083d9e 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -206,56 +206,56 @@ gtkinclude_HEADERS = \ gtkwindow.h \ gtktypebuiltins.h +.PHONY: auto-files auto-files-1 auto-files: rm -f $(srcdir)/gtk.defs - make $(srcdir)/gtktypebuiltins_evals.c - make $(srcdir)/gtktypebuiltins_ids.c - make $(srcdir)/gtktypebuiltins_vars.c - make $(srcdir)/gtktypebuiltins.h + $(MAKE) auto-files-1 -# generate gtk.defs file from gtk-boxed.defs and gcc -E -$(srcdir)/gtk.defs: @MAINT@ makeenums.pl gtk-boxed.defs +auto-files-1: gtk.defs +auto-files-1: gtktypebuiltins_evals.c gtktypebuiltins_ids.c +auto-files-1: gtktypebuiltins_vars.c gtktypebuiltins.h + +# generate gtk.defs file from gtk-boxed.defs and *.h +gtk.defs: @MAINT@ makeenums.pl gtk-boxed.defs srcdir=$(srcdir) \ perl $(srcdir)/makeenums.pl defs $(srcdir)/gtk*.h \ - $(top_srcdir)/gdk/gdk*.h > $@ - cat $(srcdir)/gtk-boxed.defs >> $@ + $(top_srcdir)/gdk/gdk*.h > gd.tmp + cat $(srcdir)/gtk-boxed.defs >> gd.tmp + cp gd.tmp $(srcdir)/gtk.defs + rm -f gd.tmp # generate type identifier header (GTK_TYPE_WIDGET_FLAGS) -$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs maketypes.awk - awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > $@ +gtktypebuiltins.h: @MAINT@ gtk.defs maketypes.awk + awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > gtb.tmp + cp gtb.tmp $(srcdir)/gtktypebuiltins.h + rm -f gtb.tmp # generate type identifier variables (GTK_TYPE_WIDGET_FLAGS) -$(srcdir)/gtktypebuiltins_vars.c: @MAINT@ $(srcdir)/gtk.defs maketypes.awk - awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > $@ +gtktypebuiltins_vars.c: @MAINT@ gtk.defs maketypes.awk + awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > gtbv.tmp + cp gtbv.tmp $(srcdir)/gtktypebuiltins_vars.c + rm -f gtbv.tmp # generate type entries for type-id registration -$(srcdir)/gtktypebuiltins_ids.c: @MAINT@ $(srcdir)/gtk.defs maketypes.awk - awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs entries > $@ +gtktypebuiltins_ids.c: @MAINT@ gtk.defs maketypes.awk + awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs entries > gtbi.tmp + cp gtbi.tmp $(srcdir)/gtktypebuiltins_ids.c + rm -f gtbi.tmp # generate enum value arrays -$(srcdir)/gtktypebuiltins_evals.c: @MAINT@ makeenums.pl $(srcdir)/gtk.defs +gtktypebuiltins_evals.c: @MAINT@ makeenums.pl gtk.defs srcdir=$(srcdir) \ perl $(srcdir)/makeenums.pl arrays $(srcdir)/gtk*.h \ - $(top_srcdir)/gdk/gdk*.h > $@ + $(top_srcdir)/gdk/gdk*.h > gtbe.tmp + cp gtbe.tmp $(srcdir)/gtktypebuiltins_evals.c + rm -f gtbe.tmp -gtkmarshal.c gtkmarshal.h: @MAINT@ gtkmarshal.list +gtkmarshal.c gtkmarshal.h: @MAINT@ gtkmarshal.list genmarshal.pl srcdir=$(srcdir) perl $(srcdir)/genmarshal.pl +# ??? # special remake rules -#$(srcdir)/gtk.defs: @MAINT@ $(srcdir)/makeenums.awk -#$(srcdir)/gtk.defs: @MAINT@ $(srcdir)/makeenums.h -#$(srcdir)/gtk.defs: @MAINT@ $(srcdir)/gtk-boxed.defs -#$(srcdir)/gtktypebuiltins_vars.c: @MAINT@ $(srcdir)/maketypes.awk -#$(srcdir)/gtktypebuiltins_vars.c: @MAINT@ $(srcdir)/gtk.defs -#$(srcdir)/gtktypebuiltins_ids.c: @MAINT@ $(srcdir)/maketypes.awk -#$(srcdir)/gtktypebuiltins_ids.c: @MAINT@ $(srcdir)/gtk.defs -#$(srcdir)/gtktypebuiltins_evals.c: @MAINT@ $(srcdir)/makeenums.awk -#$(srcdir)/gtktypebuiltins_evals.c: @MAINT@ $(srcdir)/makeenums.h -#$(srcdir)/gtktypebuiltins_evals.c: @MAINT@ $(srcdir)/gtk.defs -#$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/maketypes.awk -#$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs -$(srcdir)/makeenums.h: @MAINT@ $(srcdir)/gtk.h -$(srcdir)/makeenums.h: @MAINT@ $(srcdir)/gtkprivate.h +makeenums.h: @MAINT@ gtk.h gtkprivate.h libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @@ -314,7 +314,6 @@ testthreads_LDADD = $(LDADDS) testselection_LDADD = $(LDADDS) simple_LDADD = $(LDADDS) - .PHONY: files test test-debug files: diff --git a/gtk/genmarshal.pl b/gtk/genmarshal.pl index d85d9b7987..4518be64c7 100755 --- a/gtk/genmarshal.pl +++ b/gtk/genmarshal.pl @@ -14,8 +14,8 @@ "C_CALLBACK"=>"gpointer"); open(IL, "<".$ENV{'srcdir'}."/gtkmarshal.list") || die("Open failed: $!"); -open(OH, "|indent > gtkmarshal.h") || die("Open failed: $!"); -open(OS, "|indent > gtkmarshal.c") || die("Open failed: $!"); +open(OH, "|indent >".$ENV{'srcdir'}."/gtkmarshal.h") || die("Open failed: $!"); +open(OS, "|indent >".$ENV{'srcdir'}."/gtkmarshal.c") || die("Open failed: $!"); print OH <